From 5c52e2c95f9a93ad49500abe3a9250bba3fe1fbe Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sat, 7 Feb 2004 14:00:15 +0000 Subject: [PATCH] bitkeeper revision 1.710 (4024ef6f9YlWWmhZ6dOHYR2Gp5i6vw) xl_vbd.c: Fix VBD-updated check in XL. --- xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c index b106c57e69..77a3f0e401 100644 --- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c +++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c @@ -456,7 +456,8 @@ void xlvbd_update_vbds(void) } else { - if ( (memcmp(&old_info[i], &new_info[j], sizeof(xen_disk_t)) == 0) || + if ( ((old_info[i].capacity == new_info[j].capacity) && + (old_info[i].info == new_info[j].info)) || (xlvbd_remove_device(old_info[i].device) != 0) ) memcpy(&merged_info[k++], &old_info[i], sizeof(xen_disk_t)); else if ( xlvbd_init_device(&new_info[j]) == 0 ) -- 2.30.2